Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[12.0] l10n_br_nfe: Arruma importação do campo xFant #1945

Merged
merged 2 commits into from
Jun 4, 2022

Conversation

hirokibastos
Copy link
Contributor

Divisão de #1701

Arruma importação do campo nfe40_xFant em res_company e res_partner.

Em res_company, em alguns casos, o campo name era preenchido primeiramente com o valor de nfe40_xNome, e caso este não existisse, com o valor de nfe40_xFant.
Esta relação esta invertida, visto que o mapeamento correto é nfe40_xFant -> name e nfe40_xNome -> legal_name

Em res_partner apenas não existia um campo no qual realizar a importação, então ele foi adicionado.

@marcelsavegnago marcelsavegnago requested a review from rvalyi May 31, 2022 19:46
Copy link
Member

@rvalyi rvalyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rvalyi
Copy link
Member

rvalyi commented Jun 1, 2022

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 1, 2022
Signed-off-by rvalyi
@OCA-git-bot
Copy link
Contributor

@rvalyi your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@marcelsavegnago
Copy link
Member

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-1945-by-marcelsavegnago-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 1, 2022
Signed-off-by marcelsavegnago
@OCA-git-bot
Copy link
Contributor

@marcelsavegnago your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-1945-by-marcelsavegnago-bump-minor.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@rvalyi
Copy link
Member

rvalyi commented Jun 2, 2022

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 2, 2022
Signed-off-by rvalyi
@OCA-git-bot
Copy link
Contributor

@rvalyi your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@renatonlima
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 12.0-ocabot-merge-pr-1945-by-renatonlima-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 2, 2022
Signed-off-by renatonlima
@OCA-git-bot
Copy link
Contributor

@renatonlima your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-1945-by-renatonlima-bump-patch.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@renatonlima
Copy link
Member

@hirokibastos Eu tentei mesclar esse PR, mas como houve uma atualização no pre-commit, você vai precisar fazer um rebase depois que o PR #1950 for mesclado

@hirokibastos
Copy link
Contributor Author

@hirokibastos Eu tentei mesclar esse PR, mas como houve uma atualização no pre-commit, você vai precisar fazer um rebase depois que o PR #1950 for mesclado

Rebase feito

@rvalyi
Copy link
Member

rvalyi commented Jun 3, 2022

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 3, 2022
Signed-off-by rvalyi
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 12.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 3, 2022
Signed-off-by rvalyi
@OCA-git-bot
Copy link
Contributor

@rvalyi your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@rvalyi
Copy link
Member

rvalyi commented Jun 3, 2022

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 3, 2022
Signed-off-by rvalyi
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 12.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 3, 2022
Signed-off-by rvalyi
@OCA-git-bot
Copy link
Contributor

@rvalyi your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-1945-by-rvalyi-bump-minor.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@rvalyi
Copy link
Member

rvalyi commented Jun 3, 2022

Eu acabei de cancelar porque tinha o merge do #1957 rodando e dava de novo
https://user-images.githubusercontent.com/16926/171922107-e508629a-0a17-458b-af31-36ea93a52c04.mp4

@marcelsavegnago
Copy link
Member

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-1945-by-marcelsavegnago-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 75dc063 into OCA:12.0 Jun 4, 2022
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at f6f0469. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants